Merge "Fix issue #2538211: system server crash"