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