master-bc-1970

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