master-bc-2908

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