Merge branch 'cpan_mock_it' into QA
Merge branch 'f-1_api_rename' into QA