convert_to_relative_path() is in effect ...
Merge branch 'develop'