master-bc-1203

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