Merge pull request #2630 from abarth/rev_engine

Update engine