fix #21730 + add compat test for accidentals