COMP: removed a parentheses warning
COMP: Mac compile fix
Merge branch 'bug-16236-final-version-for-master'