Merge branch 'jk/refs-df-conflict'