Merge pull request #3483 from Zuhayr/dev-freeze

Dev freeze
Cortical borer fixes.
Further borer tweaks.
Borer surgery fix.