backported 0.15.4 datachecks