merged #779