Verified that the fix corrects the described problem (thanks for the test case, Jason!) and pushed to master through rel_2_0.
Verified that the fix corrects the described problem (thanks for the test case, Jason!) and pushed to master through rel_2_0.