Atout21 modifications backports.