Merge "Fix flag check for preserve settings feature"