This class has grown over time and the order of the methods makes it harder to understand.

Similar functions should be grouped together.

Methods which are basically just different signatures for the same functionality should be ordered in the same way in every case - starting with the Node version which includes the actual Javadoc.

Note: this improvement will have the downside of making the new version of the class harder to compare with older versions. To improve maintainability - the re-ordering should also be performed on the 5.3.x branch.