[#31319] registration option disabled by default is safer. Thanks Brian
Teeman.
Prepare for 2.5.12 release
Merge remote-tracking branch 'upstream/2.5.x' into 2.5.x