master-bc-3132

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