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