This is the second of a series of MR related to DeXTer. See the first one here: !34245 (merged)
Attn: @yuchou