Update branch
Merge pull request #5051 from esteve/update-class_loader-branch

Update branch