Fixed pbl rebuild with orca for both PB9 and PB10+