master-bc-3016

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