master-bc-904

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