master-bc-892

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