Merge branch 'dlb_backport_conf_changes' into 'main'

Backport some changes from conformance package to main

See merge request !2420