Refs #9404 Add missing return statement.
Merge branch 'feature/9404_remove_history_algorithm' into develop