master-bc-907

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