master-bc-1129

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