master-bc-954

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