Issue 531

[yuktakul04]

Description (e.g. "Related to ...", etc.)

Please replace this description with a concise description of this Pull Request.

Code review checklist (for code reviewer to complete)

• [ ] Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR)
• [ ] Title summarizes what is changing
• [ ] Commit messages are meaningful (see this for details)
• [ ] Tests have been included and/or updated, as appropriate
• [ ] Docstrings have been included and/or updated, as appropriate
• [ ] Changelog has been updated, as needed (see CHANGELOG.md)

[renatav]

I implemented this since I want to include this in the upcoming release. This is the commit: https://github.com/openlawlibrary/taf/commit/9d858334f9d90512012cccc4656638453bed5442