master-bc-1360

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