Merge "Returning to wizard, split move events." into mnc-dev