re-committing changes for WEB-7930 after merge snafu