Merge changes from topic 'YARDSTICK-1040'