Merge "Fix issue #28431297: Crash in system process" into nyc-dev