Patch 5.4.0/API changes/diff