pull updates from rcm project and fix demo