Close branch feature/gplugin-query-cleanups
feature/gplugin-query-cleanups
2020-04-19, Gary Kramlich