Fixes #4675 adds a wrapper around the 3 variables passed into views
Cleanup deprecation wrappers, add to service provider
Merge branch 'pr-509'