master-bc-846

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