Merge "Handle configuration splits when creating the class loader context"