GCP-8422
 + Additional Fixes on 8392