Merge branch 'iotssl-521-keylen-check' into development