Fix resource platform encoding
Merge branch 'pom'