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

* developer/davidsingal:
  [#72681564]
  [finish #72681564]