Merge from v1.1.0-wip branch