master-bc-1072

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