implementation for task 1969
Merge branch 'Enterprise_Pilot_1.0' into LiamTicket1969