WEB-117 merge fixed