Sync with the main branch, mainly adding the loadWithPrefix() method