LPS-44187

Pull for master sent here: https://github.com/brianchandotcom/liferay-portal/pull/17588