Merge branch 'develop' into date_fixes
Fixed todo with update id problem.
Merge branch 'date_fixes' into develop