Corrections to restricted_to logic
Couple front end fixes meow
Merge branch 'refs/heads/2.3/develop' into 3.0/develop