master-bc-840

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