Release/2.9

This should keep develop up to date with any changes submitted to release/2.9 so far.