PRD-4254, PRD-4936 - Datasource UI fixes