master-bc-2915

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