removed faulty override that's causing slow time boundaries queries
Merge remote-tracking branch 'upstream/development' into development