- merged from dev-stable