Nalexander/bug 836790 data available

This is working well locally.