Please review and test the attached patch out on platforms other than 'x86_64' which addresses this issue:

I did apply the attached patch and build it on an x86_64 machine, and successfully tested out the following: