Merged in v1.54 changes