Updated for the official release of v5.4