ML-7155: Need to be redesign

Owned by Poutre