Merge branch 'iotssl-457-badtail' into development