Merge from private branch pre-1.4.0