master-bc-981

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