Merge "Add split-stack environments"