Fix merge with fix_lazy_queries branch
Fix merge with fix_lazy_queries branch

evandrojr/noosferogov,evandrojr/noosferogov,evandrojr/noosferogov,evandrojr/noosferogov,evandrojr/noosferogov,evandrojr/noosferogov,evandrojr/noosferogov