v2.2 and some from 2.3

see changes.log