Merged v1.55 changes into development