Update to the reference build of Sharpen
Merge branch 'sharpen'