Merge origin/master into topic/master-to-2.11.x-2