merge 7.x-2.2-3
cleanup