acu116757 - Merge changes from master branch