4.x
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Merge pull request #16273 from JulienMaille:wrapper_available_target