Merge dev branch code (1)