Various small updates on the example to test various scenario's
Authored by: hermsen 2020-11-15
Parent: [r530]
Child: [r532]