Fix compilation error as part of merge
Merge branch 'develop' into childoi