master-bc-1642

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