Merge "APM: Create multiple MSD patches" into sc-dev