Merge remote-tracking branch 'origin/backlog/add-sql-hints-to-code-editor' into backlog/add-sql-hints-to-code-editor

# Conflicts:
#	frontend/src/app/shared/components/code-editor/components/query-suggestions/query-suggestions.component.ts

Author: elmilan06