Merge 'master' branch into op-build-2.5.y