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

* developer/davidsingal:
  [finish #72892738]