master-bc-1984

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