**Type:** bug / feature

The following has been addressed in the PR:

<!-- Remove the sections that your PR does not apply -->
*  There is a related issue
*  Unit or Functional tests are included in the PR

<!--
Our bots should ensure:
* The PR passes CI testing
-->

**Description:**

Resolves #???