GCP-8065
GCP-8065 and cleanup of deprecated
Merge remote-tracking branch 'origin/master'