Merge "Re-add call to isActive as it was made a SystemApi"