master-bc-1214

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