Merge "Execute namespace creation/removal only if namespaces defined" into release/2019.2.0