[[ Bug 13154 ]] Add missing return statement.
Merge branch 'bugfix-13154' into develop