When loading firmware, check the system non-packaged data dir first, then the system data directory (as before). This allows loading of firmware that doesn't reside in the system package.