Pitch 7platforms

fixed conflict for #3010.