Merge branch 'as/grep-fullname-config'