Merge branch 'iotssl-734-memcheck' into development