Merge "Improve resource loading by ~3x" into mnc-dev