master-bc-913

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