Finish the required support for #4587
Merge pull request #4599 from s0undt3ch/develop

Finish the required support for #4587