master-bc-966

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