Merge 'restriction_to_visitors' to 'production' branch