Merge branch 'dev' into developer/davidsingal
Merge branch 'developer/davidsingal' into dev