Merge 1.9 into 2.0

Contains a PersistenceWindowPool fix found recently