Reference PR for tracking new changes from develop
for DOI
#10916
+21
−2
develop
for DOI
#10916