Merge branch WEB-3030 into CoreProduct