merged #772