master-bc-802

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