New version merge from dev