merged 1.61