Merge branch 'message-callback' into kbuild/kconfig