Add layman.xml
Merge branch 'add-layman-xml' into maint