Backported dataAvailable to 2.4
Merge pull request #1112 from djbobke/2.4-dataavailable-squash

Backported dataAvailable to 2.4 from 3.0