Merge "Added check in PUT policy"