Merge "Speed up NetworkPolicy thread during user creation" into rvc-dev