Implemented in v1.55