master-bc-3195

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