KM: added changes from CA and other modules updates