fixes per CR for WEB-9143 +review WEBCR-323