Merge branch 'bw/refspec-api'