master-bc-3062

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