Merge branch 'develop' into lbudginas/#635_translate_exported_filenames