[deliver #71558746]
Merge branch 'developer/davidsingal' into dev
Merge branch 'dev' into smbtc