Merge "Rename context variable and format code" into main