Merged v1.55 work to trunk