#29749 added WCI menu
#29749 self-review comments impl
Merge branch 'Jagadees-zyxware-master'