SIO-1390 Complete the implementation of the admin timeline

Change-Id: Ic531d1fa587dcaed26906360a0eef775d0cd012f
Merge "SIO-1390 Complete the implementation of the admin timeline"