Merge 'iotssl-591-glue-layers' into development