demo fix
Merge branch 'demoup2' into compat
s2226drv user ctrl