Lps 49294 LocalVariables 1

Split the remaining commit into 3 seperate pull requests, here is the first, the other 2 will follow shortly