branching preparations
support for 6.2
doc changes