Removed "img" from resources
merge upstream