Merge changes from topic 'manual_ci_test_cases'