FORGE-2006: Added @PreMatching