Merge branch 'jc/leftright'