avoid useless synchronisation
avoid NPE on profiles.xsd load
Merge branch 'master'