Use time-of-day expression instead of hour on ExpressionTime
Merge remote-tracking branch 'indicium/master' into dev-ugw