Compile error

Compile error
Merge branch 'feature-MAX-98' into develop