master-bc-3015

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