Patch 5.3 changes
Release for 5.4