master-bc-1274

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