Merge in griffas's changes to `HomePort` class