UPDATE: Odhelper.fix_project_data_types (skip_to)
Merge branch 'master' into working