master-bc-1885

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