MEG-5: Enabled-Disabled
MEG-6: Capture order complete action
Merge origin/master