master-bc-1846

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