master-bc-877

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