Provide the necessary code changes to support #4587. Again, sorry @kinware for my rudeness.
Merge pull request #4590 from s0undt3ch/develop

Provide the necessary code changes to support #4587. Again, sorry @kinware for my rudeness.