fix dev build for R17