Merge branch 'ds/maintenance-pack-refs'