Changed method scopes.
Merge branch '4.0'