Merge remote-tracking branch 'upstream/develop' into English_phrases
Merge remote-tracking branch 'upstream/develop' into English_phrases
Merge branch 'develop' into English_phrases
Corrected some English phrases
Corrected some English phrases

* origin/pr/11607:
  Corrected some English phrases
Avoid potential Primary Key misidentification for string values

Use the associative method to query the modContext.key value to prevent misidentification of the value as an expression instead of a PK value

(cherry picked from commit 3d8408188a5e09125e7b05d0d8f0cace5786f8d8)
Validate and sanitize _ctx placeholder used by ResourceManagerController

(cherry picked from commit f7964a786a6436891a77c32b19e7ef858bac2f69)

Conflicts:
	core/docs/changelog.txt