Merge "Remove unnecessary & uninitialized variable Bug #7728929"