master-bc-2964

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