WEB-483 made some updates to work with lock enforcment