[misc] now really continue with 2.2 on master