CS: `return` instead of `return null`
Merge branch 'cs/#7014-empty-return-instead-of-null-return' into develop

Close #7014