Merge commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5' * commit 'cc5c8a42fc609246d8f781a22e24d084c76cc9c5': change to use the new CALLER_IS_SYNCADAPTER flag