Merge new-installer branch to trunk