Merge from v1.1.1-wip