master-bc-909

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