You need to create a separate branch for RESTWS-405 so that it doesn't contain these changes for the care setting ticket otherwise it might be a problem when merging the code to master. Also i won't have to re-review these changes