Tracking improvements. Implements rfe #1562

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>