Patch 7.2.5/API changes