LPS-49294-LocalVariables

Resend of prior commit after changes to SF merged in already and additional modifications to constructors.