LPS-35230

https://github.com/brianchandotcom/liferay-plugins/pull/1607