Update project.default.xml
Update other.xml
Update project.default.xml, ide.general.xml
Update other.xml, project.default.xml, ide.general.xml
Merge branch 'master'