master-bc-1754

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