Merge by hand 7_3_X into 7_3_ROOT6_X

Merge by hand some pull requests that had not been merged in the previous days because the script was failing.