Merged in v1.55 changes