Merge commit '5fa70e2794' into release/8.0.4 # Conflicts: # public/legacy/suitecrm_version.php
5fa70e2794