Fix blocker and some critical sonnar issues
Merge remote-tracking branch 'origin/develop' into develop