merge with mansos -r893