Merge "Wait longer for configuration change" into rvc-dev