Merge branch 'jc/bottomless' into next