WIP shell example
Merge remote-tracking branch 'origin/develop-SN' into develop-JK