ML-3279: Need to be redesign

Owned by Poutre
  • Open for trades