Merge "Fix NPE in AbstractMasterSystemService." into sc-dev