merged 60633 in to 60827, closes #175