Merge "BUG-2363: Wire NSF apps to local models"