Sync GitHub commit 5677d7c production and endpoint fixes 38365d2 unverified krishnachoudhary-hclguvi commited on Apr 4