Merge "Local and Class variable name conflict resolved"