master-bc-948

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