Merge release/2.6.0 into develop

This branch contains the changes that were in 2.6.0 but not in develop, as well as conflict resolution from incompatible changes between develop and release/2.6.0