Merge branch 'master' into develop
Fix not being able to filter null.
Merge branch 'develop'