LPS-40389 & LPS-39585

For 7.0.x - LPS-40389 & LPS-39585

Please ignore: https://github.com/brianchandotcom/liferay-portal/pull/16047