Merge branch 'jx/clean-interactive'