master-bc-1388

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