4.x
Merge pull request #25986 from asmorkalov:as/js_for_contrib
Merge remote-tracking branch 'upstream/3.4' into merge-3.4