LPS-49294-Branching-Code

Resend of prior pull request after changing source formatter and running to format source to fix naming conventions