FS-3071 I've finally merged it all.  It all look good, shouldn't affect anyone who didn't set those value