Fix compiler warning
Merge branch 'develop' into MAX-65