MP1-4520: Fix tablename typo and bypass the 'safe-mode option' error by including a WHERE clause in the statement
Merge remote-tracking branch 'remotes/upstream/MP1-4520-BUG-Fix_potential_SQL_upgrade_issues_and_improve_the_statement(s)' into 1.7.0Fork-BDJ