Implemented in Rev 2580