Some changes for upcoming v1.56