Backport bash fixes to 10.0.3