merged with K2 2.6.6