Fix merge & cleanup default branch
Merge pull request #1 from mikeNG/kk4.4

Fix merge & cleanup default branch