Merge "Loading NanoApps now works." into nyc-mr1-dev