LPS-47110

Hey @drewbrokke,

There are some issue with this update as @rotty3000 pointed out in https://github.com/rotty3000/liferay-portal/pull/472.

Can you please update these issues and add some tests for this update?

Please let me know if you have any questions.  Thanks!