ML-5231: Need to be redesign

Owned by Poutre