Sweep !20637 (merged) to 21.3
See merge request !20815 (merged)
Sweep !20637 to 21.3 See merge request !20815 (cherry picked from commit 20b53e3f) fcf38b29 Resolve jsROOT conflict