Merge "Fix regression in using visibility flags. "