master-bc-1991

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