Rebase on use_nahi_client branch (for the story coming this sprint).