Merge branch 'master' into kernel_callables_v3-edit2