Maint/1.3.x/backport report query fix