Engine CRUS wrapup. Fixes #47