Merge branch 'ma/config-advice-markup-fix'