LPS-38143

https://issues.liferay.com/browse/LPS-38143

Hey Jon, I'm not sure everything is correct here. Can we go through this together when you pull it? Thanks!