Make changes for demo in release 1.11
Merge branch 'release/1.11' into dev