[TASK] Introduce @respectMatchFields annotation