v2.97 final collection of changes