master-bc-2470

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