Merging fixes from version 8.5.0 upstream#11

c3-avidmych merged 2 commits intomerge-8.5.0-upstreamc3-e/spark:merge-8.5.0-upstreamfrom

server-version-8.5.0c3-e/spark:server-version-8.5.0Copy head branch name to clipboard