Sk/reverse index query optimize#1379

snopoke wants to merge 5 commits intomasterdimagi/formplayer:masterfrom

sk/reverse-index-query-optimizedimagi/formplayer:sk/reverse-index-query-optimizeCopy head branch name to clipboard