master-bc-3234

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