Merge Sprint release 2021-03-29 back into hotfixes#3072

Merged

rtibbles merged 2 commits intohotfixesfrom

sprint-release-2021-03-29

Apr 6, 2021

Commits on Apr 6, 2021

Disable modified_since check, since needs further query optimization
bjester
committed
Merge pull request #3069 from bjester/disable-modified-since-check
rtibbles
authored