LPS-49294-Constructors

This pull-request reverts the previous revert of a partial merge, and fixes the reason why it failed (I mistakenly put a dependency of a file changed in one commit into a second commit that was rejected in the partial merge). I have a pull request with the formatting changes you requested ready if this pull is acceptable