[WIP]  Add a fix for gcc bug 60255

See commit logs.

TODO:
* [ ] Make this optional only