master-bc-965

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