ML-1596: Need to be redesign

Owned by Poutre