master-bc-1361

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