master-bc-787

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