Patch 1.15.2/API changes