[TECH SUPPORT] LPS-51122

Based on this change: https://github.com/brianchandotcom/liferay-portal/compare/074891a420...82e506a176