PR Checklist:

Have you run the unit, integration and smoke tests as described here?
If you added public APIs, did you write the JavaDocs/kdocs?
If the changes are of interest to application developers, have you added them to the changelog, and potentially the release notes (https://docs.r3.com/release-notes.html)?
If you are contributing for the first time, please read the contributor agreement now and add a comment to this pull request stating that your PR is in accordance with the Developer's Certificate of Origin.

Thanks for your code, it's appreciated! :)