Fix for GCP-7948, GCP-7953
Merge remote-tracking branch 'origin/master'