Merge branch 'jc/bottomless'