#102: Apply patch by @tdan
Add important notes for :core branch
Revert #86211ff and fetch update from :core