(Research/DBF) Porting fix 9382542 on DBF to Research