Merge branch 'ak/t7800-wo-readlink' into maint