Customer feedback 1.2: refs #1774
Customer feedback 1.2: refs #1774