master-bc-3086

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