master-bc-903

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