merge code from dev-opensource to master