3 Commits (hosSet-fix-1212)