Merge branch 'lj/refs'