Implemented in Rev 2944