Merge branch 'feature/refactorQualifiers'