master-bc-1689

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