LPS-34286

Fixed two of three isolated issues on this ticket. Last issue to complete is distribution scope. Thanks, matt!