Merge "updates to subscriber tosca on flex pod"