Merge pull request #10618 from keymanapp/fix/core/10615-10616-10617-core-surrogates-and-app-context-markers-and-memory-leak fix(core): surrogate handling, markers in app context, and memory leak
