filter out moved defects.
backed out filtered change (moved to new branch)
Adding changes made by Barry with filtered out snapshots.