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