converted more fields to local variables
merged
Merge commit '5475b8981fddf53e9913ecf89539226b76b98dc7'