RF-12860: demo simplified