Merge branch 'osl_strings_add_strings+osl_generic_nclone' of https://github.com/Haere...