Merge pull request #738 from TheBlueMatt/2020-10-opt-test