Merge branch 'jp/refs'