Merge branch 'master' into wip_leon_T7858_use_locked_data_for_historical