master-bc-1634

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