Merge "Fix NullPointerException in ActiveServices" into sc-dev