master-bc-1076

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