Merge branch '5870-3-2-sql-updates-not-complete' into 'develop'

Resolve "3.2 sql updates not complete"

Closes #5870

See merge request !1326
1 job for develop in 16 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Syntax
passed #8652
syntax_diff:lint

00:00:16