Merge "Avoid double resource compilation" into main