Backport 5.2 to master

Merged Julien Wadel requested to merge fix/timezone_conf into master

Merge request reports