Merged v1.55 branch into development