Merge develop into develop-2.0.0RC