Backported code to support future updates