docstring update
changelog update
Merge branch '2_9'