master-bc-2968

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