master-bc-1692

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