GCP-7994
GCP-7995
GCP-7995
GCP-7995, GCP-7915
Merge remote-tracking branch 'origin/master'