master-bc-2343

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