Merge branch 'development' of https://github.com/symphonytool/symphony into acf
Merged with FT-plugin. Small improvement to error reporting.
Merge remote-tracking branch 'origin/acf' into alrd