Platform changes from 7.x