Merge changes from topics 'YARDSTICK-1351', 'YARDSTICK-1339'