merged #535