It would be great to these changes merged into the 2.3.1 FPC branch.