Merge branch 'av/maint-config-reader'