Added baseline changes from web-application branch.