master-bc-1733

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