master-bc-2157

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