master-bc-3011

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