Rebased to latest kubernetes commit