'Coded' demo app + demo code refactor, required fix again...
[#85114064]