master-bc-1994

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