LPS-46372

Hey @brianchandotcom,

Attached is an update for http://issues.liferay.com/browse/LPS-46372, https://issues.liferay.com/browse/LPS-46202, and https://issues.liferay.com/browse/LPS-47486.

Please let me know if you have any questions.  Thanks!