This PR backports regular version bumps and prdocs reordering from the current stable release back to master