LPS-40824

Discussed with Alex here:

https://in.liferay.com/web/global.engineering/forums/-/message_boards/view_message/1837118