Merge pull request #1 from dcos/kk

P880 tweaks