mergerd from dev trunk