Amend prev commit: Only adjust matrix if actually going to apply BPC
Authored by: fhoech 2019-11-28
Parent: [r6328]
Child: [r6330]