Merge "Add flag to cmd for dynamic services"