Merge "Fixed resolver list crash" into rvc-dev