master-bc-2402

https://issues.liferay.com/browse/LIFERAYQA-10987