minor fixes
Merge remote-tracking branch 'remotes/origin/dev-SOA2-lena' into dev-SOA2-lena