12145 rnd settings

Fix out of synch. Modified in that branch to avoid possible conflicts.