[finish #72164734]
[finish #72163972]
[finish #72162888]
[finish #72164670]
[finish #72163530]
Merge branch 'developer/davidsingal' into dev