LPS-47546

@jonathanmccann Support should be doing the backport after this is approved.