master-bc-1173

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