merged from private repository for v 1.1