Merge "Fix NullPointerException in ActiveService" into rvc-dev