master-bc-3093

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