Automatic hour

Merged Laureano Kloss requested to merge automatic_hour into 12.0-stage

Merge request reports