merged in dev-frontend changes