master-bc-805

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