'merged' frontend from devel to 2.0