Merged changes from WK project