PAHMA-968: making the small change suggested in the JIRA
Merge remote-tracking branch 'upstream/master'