Enable/Disable functionality for Data Authorization
Merge remote-tracking branch 'refs/remotes/origin/master'