Merge "Additional updates for Subscriber docker image"