See #5807 We need to patch this in 1.1.X
See #5807
We need to patch this in 1.1.X