Merge "Revert "Propagate exception from inline/dropdown selections"" into main