manulay merge from dev