Merge "Update visibility rule"