master-bc-2223

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