Merge changes from topics 'YARDSTICK-1343', 'YARDSTICK-1342'