master-bc-2208

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