Merged from devel tree