Further borer tweaks.
Borer surgery fix.
Merge pull request #3486 from Zuhayr/dev-freeze

Borer surgery fix.