master-bc-2318

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