Refs #6758  Inital Checkin for this ticket
Merge branch 'feature/6758_DataService' into develop