Yet another merge of 'master' into 'new_function_interface'