Implemented in aa468b3