Changes following drc_shared commit 410a8c6