No var_dump() and document the potential boolean return.
Merge branch 'hotfix/Cleanup_of_hotfix'