Merge Version 3.0 into kk4.4