Note that this should be rebased on 6.2 now that a security release was published without the 6.1 changes.
Note that this should be rebased on 6.2 now that a security release was published without the 6.1 changes.