master-bc-785

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