GCP-5358 re-comitted overriden codes