5.4-dev
Remove un-used variable store Exception in try catch block (#44892)
Merge branch '4.2-dev' into 4.3-dev