Future support for homeshick with warning
merged future homeshick support