generic: 5.15: fix AQR 113C and 813