master-bc-815

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