Merge "mm-core: Increase max instance value to 16"