master-bc-901

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