LPS-43687

Hey Brian,

I have sent the pull also to ee branch https://github.com/brianchandotcom/liferay-plugins-ee/pull/4900

Thx!