master-bc-1155

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