master-bc-1069

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