Cleanup of Modification for FB 4858 - use sourceTags instead of
sourceList when sourceList not present...
Incremental progress on RDS