Patch 8.3.7/API changes