Merge branch 'dev' into feature/gps_data