[MERGE] Adding upstream missing ressoures and HUI files