Merge "modyllic patch" and "modyllic apply"