master-bc-1820

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