Manually patch v0.54 for 5fb9d2619fbfa66782edaca9283221e32545e737