master-bc-1631

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