Find the missing function
Merge branch 'develop' into release/2.11