implement changes of PURE-231
Fix showcase to old (svn) state.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into FIT-40