Small improvenents requested by Andre.
Merge branch 'development' of https://github.com/symphonytool/symphony into acf