development: Fixed unreachable return statement
master: Fixed unreachable return statement