Code for GCP-9886 / GCP-9885

Created new functions as per requirement

Post commit code review : Jai Villarino