LPS-33812

See notes on https://github.com/jonathanmccann/liferay-portal/pull/123