Merge "Add context for some errors." into main