additional data checks backported from 0.15.4