merge #247