LPS-44221

Please backport to 6.2.x and ee-6.2.x for in.liferay.com