master-bc-828

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