Yes, this is currently in cms/envs/common.py as well.