master-bc-3019

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