Merge "Resources metadata changes"