Merge "updates to configurations for flex pod"