DF-4918 pass reference instead of pointer