Merge "fixed missing resource files"