master-bc-929

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