NOJIRA: bring this branch up to date with latest webapps changes.