Merge "Catch a few extra users of UserEnvironment." into klp-dev