Merge "Complement sims configuration files"