merged from 1.1