Merge changes from topic 'bug/yardstick-864'