Changes for issue reported in FALCON-397, submitting on behalf of @venkateshs