master-bc-7301

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