Merge "adaption to installers/pod configs"