master-bc-844

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