Dev: Shell: more cleanups in cib updates
Mercurial revision: 3c15dbc1043bdcd3e58a7cd674802576b37a0569