Merge branch 'ff/ascent'