Mark #8562 as fixed