Merge "Update Kitchen Sink to allow us to dynamically change User Restrictions"