2.9.0

this will be the merge for 2.9.0 including #117