merge from skcraft

requesting myself to review if there are any merges