merge dev branch

prepearation for API10 compatibility