some changes to demo branching
some changes to demo branching
(cherry picked from commit c9ed006)
fouth comment
(cherry picked from commit 2c104f2)