Merging in v1.60