Merge branch 'reversion'