Merge from feature-MAX-58

Merge from feature-MAX-58