master-bc-2436

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