conflict not solved #3546
Merge remote-tracking branch 'origin/master' into issue-4566-Add-War-Testing-Infastructure