Merge "fix NPE serviceOrder"