Merge branch 'jc/oneline'