Merge develop branch into develop-2.0.0RC