[#3338] Correcting what happens when required is false
[#3338] Tweaking some language
Merge branch '2.3' into 2.4