Release/2.9 into Develop

This is a pull request for keeping develop up to date with changes which have been submitted to release/2.9