master-bc-1887

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