initial commit of K3.3 required changes