Merged v1.54 branch back into development