master-bc-3096

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