Merge "Fix robotests failure in connectivity settings" into rvc-qpr-dev