Merge branch 'release/0.6.1' into develop
Bugfix: trimming pcfarmoptions and splitting it if there are several options in it...
Merge branch 'release/0.6.4'