Merge commit 'af6941fbcf6f4f4efeb372a9a937463ff630b81c' into topic/master-to-2.11.x-2