Merge branch 'ufs-macro'