master-bc-2

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