Squashed 'hadrian/' content from commit 438dc57