master-bc-973

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