master-bc-803

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