Forward merge from master to 1.2.x branch, and enabled the @AccessControl flags
Merge pull request #29 from rareddy/1.2.x

Forward merge from master to 1.2.x branch,