Merge "Fix issue #3202866: system server crash"