Improve data check
Merge branch 'master' into subtreeable