pre-merge from K-OSX