Merge branch 'key-pair-refactoring' into 'master'

Key pair refactoring

See merge request !1083
1 job for master in 7 minutes and 38 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #3386
test

00:07:38