master-bc-1002

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