Merged v1.81 back to trunk