master-bc-906

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