refs #5697; refactoring, +reload/force-reload