Rebase against CRS4 fork