Merge "Attempt to solve the double-GC problem" into mnc-dev