Merge pull request #5983 from librick/feature_sk_ecc