Chatper 2.3.5 commit for demo app