[Testing] improve oreobf performance / potentially fix errors (reverse-merged from commit 1d56399e1688b8947939f26783aecfef51bdd6f6)