Remove duplicate code.
Save the settings to update the rnd update_id.
Merge pull request #2065 from jburel/rnd-copy-paste-develop

Rnd copy paste develop