master-bc-1987

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