Merge branch 'hijack'