Merge branch 'fixup-thunderx-hierarchy' into devel