master-bc-2995

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