Merging trunk into v1.61