[PATCH 0/8] MR6709: Code refactor reduced variable inner scope