Extended compatible range up to Idem 23. No functional changes.