master-bc-938

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