Merge "Propagate exceptions to developer" into main