Features/waterbody api fix#862

kapildadheech wants to merge 5 commits intostagingcore-stack-org/core-stack-backend:stagingfrom

features/waterbody_api_fixcore-stack-org/core-stack-backend:features/waterbody_api_fixCopy head branch name to clipboard