re #8924 mac fix for old std libraries
Merge branch 'feature/8924_Intrument_file_repo' into develop