[#72532396]
[#72532396]
Merge branch 'developer/davidsingal' into dev