UCBG-319 Appended the missing final return statement from function definition.
Merge branch 'botgarden_3.2' into botgarden_3.3