pre merge release 1.1