Refs #6758  Inital Checkin for this ticket
Merge remote branch 'origin/feature/6758_DataService'