VE-654: add support for tracking with matching dot notation