master-bc-2070

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