[finish #72943956]
[finish #72947392]
Merge branch 'developer/davidsingal' into dev

* developer/davidsingal:
  [finish #72947392]
  [finish #72943956]
Merge branch 'dev' of github.com:simbiotica/iom into dev

* 'dev' of github.com:simbiotica/iom:
  info icon