master-bc-836

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