Merge "Fixing an incorrect variable name" into stable/brahmaputra