back merged develop branch. apis updats