SOS-1568

ee-6.1.x backport is commit. https://github.com/brianchandotcom/liferay-plugins-ee/pull/1743