fix expected results
Merge remote-tracking branch 'forge/2.3.x' into 2.3.x