master-bc-3216

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