merged from dev, changed rev number