master-bc-2047

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