merged with SE master