Merge "Fix another miranda method moving GC bug" into mnc-dev