Cherry pick from 0cd0e1bf8e: Waiver fix