Merge "Add missing null check in Container name validation"