:merge: webcore