merge #368