Merge "APM: Create multiple MSD patches"