LPS-47130

Updated with suggestions, separated different types of changes across several commits.