Update example app with changes from SPR-11781