Merge changes from topics 'YARDSTICK-1154', 'YARDSTICK-1160'