Merge branch 'ds/use-get-be64'