master-bc-2408

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