Merge "Don't set functions at registration on boot"