master-bc-1999

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