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