VP : Fix BRI and experimental  BRA

This patch is from [DH] however it failed  PSGL testing and need more work before we can merge it .