master-bc-1876

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