re #8924 solve cmakelist merge issue
Merge branch 'feature/8924_Intrument_file_repo' into develop