Merge branch '6406-undefined-conf' into 'develop'

Fix undefined $conf, #6406

Closes #6406

See merge request !1655
1 job for develop in 10 seconds (queued for 4 seconds)