Merged with 1.66