Merge "Merge kwd to master"