recommit changes for WEB-7686 on its own branch