master-bc-2232

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