Merge v1.0.2 onto v1.1.0-wip