Merge "Add stored class loader context option"