merge profile consistent check fix from 2.8 branch