Merge branch 'config-updates-from-hackurx'