Merge branch 'develop' into fix-timesheet-creation