LPS-52145 SF

Passing it to you because the WCM should make the final decision but see my comment in JIRA for my opinion