Merge branch 'parse-ec-key' into development