Merge changes from topics 'update_pass_tests', 'update_pass'