Merge "Controls UI - Do not save empty structures" into rvc-dev