Merge branch 'Wignored-qualifiers'