GCP-6167
GCP-6918 GCP-6760
Merge branch 'master' into master_dev