master-bc-1681

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