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

Rnd copy paste dev 5 0