Patch 1.15.4/API changes