@AndyS, you may want to try with 8.1.0 Beta 2 firmware?
MAX BR1 Classis HW3 with firmware 8.1.0 Beta 2: