Re: [clc-devel] road to 2.2; some change proposals