LPS-52037

This is an update for [LPS-52037](https://issues.liferay.com/browse/LPS-52037).<br><br>Hey Jorge, this seems sound as far as I can tell, used to how things are wired, can you look over this to make sure it's good?  Thanks!