release 2.2.6, control fixes