master-bc-939

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