Configure class for views.
Merge remote-tracking branch 'origin/java-6' into java-6