Squashed commits from trusted-ibm to avoid clutter in the repository
This follows on from !6 (closed)