Great catch, James! I've applied this to master and backported it through rel_2_2 and rel_2_1. Thanks!
Great catch, James! I've applied this to master and backported it through rel_2_2 and rel_2_1. Thanks!