changes for GCP-9304
- moved ` inside procedure and adjusted procedure calls accordingly

Changed by: Naymesh Mistry
Reviewed by: Glenn Marintes