LPS-41030 (LPS-39735 part 3)

Hi Brian,

another part of LPS-39735 :)

I created a common ticket for the rest - https://issues.liferay.com/browse/LPS-41029, this is the first sub-task.

Thanks.