[app/87] use latest code
[app/61] use latest demo code
[app/87] use latest demo code