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

* developer/davidsingal:
  [finish #72452272]