Improved formatter again
Merge branch 'ux' into parser
Merge branch 'parser' into ux
Schema dump
Merge branch 'parser' into ux
User functional tests fixed...