master-bc-1805

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