master-bc-955

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