Param to force hours in time formatting
Merge branch 'develop'