master-bc-1649

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