Merge branch 'master' into wip_leon_T7905_time_picker_outclick_breaks_