fec9f1f10c
And small cleanup (cherry picked from commit 4811cf07cdbf052dc3ddd2916e56ed81b6dc652a)
And small cleanup (cherry picked from commit 4811cf07cdbf052dc3ddd2916e56ed81b6dc652a)