WEB-5807 and WEB-5510