thanks Nathan Xu ! I’ll have to move it to version 5.4.11 though, as we need to release it and I couldn’t make time to review your PR yet.