Investigate and apply any needed changes based on this PR: https://github.com/ShaftHQ/SHAFT_ENGINE/pull/2716/changes
Investigate and apply any needed changes based on this PR: https://github.com/ShaftHQ/SHAFT_ENGINE/pull/2716/changes