master-bc-2324

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