master-bc-3003

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