[clc-devel] contrib/opt merge: second thoughts