merged #1360