merge #367