@mengxr Are we in agreement here for the immediate fix for the PR? I think we all agree on the final version but wanted to make sure we have consensus for this PR before I implement your suggestion.