master-bc-807

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