Eroberson development patch 3b3b

What is your Merge about?

If this is your first merge, please use the Initialization Template.

For more information please visit Iron Bank Documentation

Note: Please be sure you create an issue related to this merge request and the issue is labeled StatusReview, this will initiate a CHT member review of your merge request.