Implemented in v1.6021