master-bc-1005

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