Merge branch 'master' into wip_leon_T7841_replace_gmt_lists_with_timezone