Extremely minor runtime fix.
Fixes #7327
Fixes #7431
Merge pull request #7544 from Zuhayr/dev-freeze

Several fixes.