Created an attachment (id=297481) Patch 6 more nits fixed
Put back modifications of those variables when needed.
Created an attachment (id=297481)
Patch 6 more nits fixed
Put back modifications of those variables when needed.