Fix issues with duration truncating per hour
Merge branch 'stakeholderReview1'